st: Handle emulated scroll events through the ClutterEventFlag

Emulated scroll events no longer get clutter_event_is_pointer_emulated()
set to TRUE, instead this information is propagated through the
ClutterEventFlags of the event.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2871>

diff --git a/src/st/st-scroll-bar.c b/src/st/st-scroll-bar.c
index d5d5264943706d8d59d52d58eb1ae7403e9cb57b..e2c09203e1b123d036fbe2f3731dfa52ff1b0789 100644 (file)
--- a/src/st/st-scroll-bar.c
+++ b/src/st/st-scroll-bar.c
@@ -469,7 +469,8 @@ st_scroll_bar_scroll_event (ClutterActor       *actor,
   ClutterTextDirection direction;
   ClutterScrollDirection scroll_dir;
 
-  if (clutter_event_is_pointer_emulated ((ClutterEvent *) event))
+  if (!!(clutter_event_get_flags ((ClutterEvent *) event) &
+         CLUTTER_EVENT_FLAG_POINTER_EMULATED))
     return TRUE;
 
   direction = clutter_actor_get_text_direction (actor);

diff --git a/src/st/st-scroll-view.c b/src/st/st-scroll-view.c
index 9f667e5459a3c35b86dee2e2b51931d5e974f053..764065b606e70d08a6c8069f5242bdceaedc8c7a 100644 (file)
--- a/src/st/st-scroll-view.c
+++ b/src/st/st-scroll-view.c
@@ -770,7 +770,8 @@ st_scroll_view_scroll_event (ClutterActor       *self,
   if (!priv->mouse_scroll)
     return FALSE;
 
-  if (clutter_event_is_pointer_emulated ((ClutterEvent *) event))
+  if (!!(clutter_event_get_flags ((ClutterEvent *) event) &
+         CLUTTER_EVENT_FLAG_POINTER_EMULATED))
     return TRUE;
 
   direction = clutter_actor_get_text_direction (self);